Removed use of the @ operator in Client