2.10.1 - make strict write mode work more reliably