Testing a fix for merge, i accidentally broke it in a previous commit.