issue #603