Tap disable was a bit buggy