Fixed double data call bug