Make things more universal so no issue will occur on my KT-TWRP