fix ship to me functionality 10