Ok, fixed my fix. And added more tests