Fix gradle issue because of a bug in gradle