I should have committed this a month ago... Not sure what I actually changed in this...