Updated SDK fix