issue #592