Normalize controller lookup, fix #2025
Merge pull request #2131 from darthdeus/normalize-controller-lookup

Normalize controller lookup, fix #2025