Issue #281 resolved