fix bugs :)