https://github.com/FoxUSA/OpenNote/issues/108 fixes