Fixing for single oracle_enhanced case