Fix double robots

As discussed in issue #562 (not the same, but related)