Better fix for #10

Last fix was crap