Fix for broken test in #1348
Merge pull request #1470 from avaris/fix_1348

Fix for broken test in #1348