Re-implemented Rapid-Tap fix