2.8 SDK Fix