First properly-fixed commit