Fixed for SDK integration