Issue #573 quick fix

Here is quick fix for #573, but this thing should be probably redesigned. 
Not sure that there is an easy way to do that and not to break any of current community scripts rely on `robot.router`