Added enableTapEvent