Fixed bug on return callback url