Clean diff for PR#36