Fixed problems blabla