fix ship to me functionality 4