Make compatible with new sdk version