be a little more inclusive about when to disable the pitch