Fixed for GNL 3.4
Merge pull request #1 from theknut/master

Fixed for GNL 3.4