Fix issue and include test from @TheRoSS on gh-301