Fixed bug in tap handling introduced in beta 1