commit #668