Fixing up broken engine selection logic