Fix from AOKP