Fixed bug on Return link (final stage)