workaround Groovy issues

workaround Groovy issues