Use let instead of tap