Fixed weird behavours, now it all works