added default-controller check