Controller final commit fixed (Alvin Ho)