[#53] Fixed controllers