Tried to make taphold more robust