Attempting to fix tap delay again