update controller

(cherry picked from commit 50515a7dcfe6bb8518d895bd55157ac8e7c3affb)