Added a failing test for #12
Fixed #12
Merge branch 'hotfix-6.0.2'