Christ, i fudged it because i didnt look at the test of the commit. this should
be better now