Bug fix for operators