Client controller conflict fixed