Further improvements in get_tap