Fix for GROOVY-6495: Add quoting