fix hardcode, fix using kitkat