Fixed an issue with server-side return URL