Fixed #619