Fixed bug with first tap not working