Resolves #96
Testcase for #82