Fix for andriod 3+