Added better compatibility with other controller resolver.