fix issue #610