Fix duplicate disable methods