defeats fix per CaptainBahab