Fixed issue #619