Fix testfor #1208
Merge pull request #2067 from yakky/feature/fix_1208_test

Fix test for #1208