commit #767