Obligatory OCD commit