Default controller fix