Merge pull request #523 from TheBlueMatt/2020-02-router-ser-fix