Fix for @steffansluis merge stuff