fix buy now flow