Fixed #689