More on refining controller

[skip ci]