disabled bug fix