Fix pr1464

pull request 1464 plus changes needed to preserve 2017 geometry configuration