Remove dangerous bug