Partial fix for binaryOps - now detects field, still needs tweaking