fix issue #606