Temptative fix for GROOVY-6279
Merge pull request #224 from melix/GROOVY-6279

Fix for GROOVY-6279