some fixing. Fuck I hate that i do not use rspec!!!!!!!