Fix for #3155
test fix for #3155
Merge pull request #3156 from rottame/master

Fix for #3155