commit #689