Fix old Android bug (doesn't support remove)
Fix old Android bug (doesn't support remove)