Workaround to fix #1393
Merge pull request #1394 from timlinux/fix-1393

Workaround to fix #1393