Found severe bug in simulator + add/remove operator.