Fixed stuff - Bug