Done. I'll work on adding a test case for this next, if no one (from the core team) is on that already?