Fixed data dependency issue