#432 Make operator handling more robust