commit #674