issue #604 resolved