Issue #593 - fixed