Some awkward changes to make it similar like AOSP