fixed operator issues