fixed for current android studio