Fixed overthrow bug