Issue 488

Initial PR containing failing test for issue 488