fix ship to me functionality 9