Fixed Handle return type