Wfly 2800

I've added a test case and a proposed solution to my fork.