Data return fix