Fixed Christines tap issue