Temptative fix for GROOVY-6279