Fixed for sdk 17