This should be easy to fix. Archie Cobbs, would you like to take a shot at creating a pull request with a test and fix?