Fix support for sdk version <= 16