fixed buggs