Fix tap regression