Fixed return type for tap