And another tial to achieve 5.2 compatibility