fix ship to me functionality 3