Added operator check