fix return_to scheme