Fixed buggs