Fix for hardcoded operators