I reforked and added my change. Best of luck.

Remerge my changes with latest version.  Your changes not tested with mine.