Fixed controller issue
Merge pull request #47 from atlasapi/MBST-9286-flow-improvements

Fixed controller issue