Fixed to work with latest version of gradle