Changed controller resolver to proper listener