fix problems :)