Fixes data dependency