Bug Fix for compatibility with Groovy 2.1