Fix to an unbelievable bug