Fixed issue with operation simulation