Fixed issue #611