Updated the helper for SDK fix