Fix for tap delay