Correcting drawbat bug