Fix for full run operation mode