commit #676