Fix for gradle 2.1