Issue #220 resolved