Fixed data strategy bug