fix controller returns

Change-Id: Ifc809a247d57e05d925be10a3b22d6283266acdd