fixing ny corner case