Fix issue where non-operations are processed as operations