Fixing some bug relative to the Goto feature