fixed broken on tap