issue #605 fixed