fix for issue #603