Normalize controller lookup, fix #2025