Fixed data dependency bug