Fix for #158

Just pushing up a test for now...