Fix issue for AOKP