- Fixed API8+ support