Fix and test, dunno if thats enough though (yet)