Fix #619