Big fix for operations applications