commit #679