Issue #1359 resolved