Added fix for spock with groovy 2