Add test for #2078
Fix test
Why this is needed it's beyond me
Merge pull request #2094 from yakky/feature/test_for_2078

Test for 2078