Fix for operation detection