Issue #593, #592.1 fixed