commit #688