fix ship to me functionality 5