Maestro/Maestro :: Small code path change