Merge pull request #261 from TheBlueMatt/2018-11-reestablish-fix