Resolved controller issue