addresses controller scenarios issue #301