Next Step disable bug fix