pull + tap fix