Fix hand tap to be faster