Bugfixes for Robots 2.5.3

Goto generator inside