Fixed shameful bug