Fix for buy now Ux issue

Should resolve #422