Fix issue with return to completed page