Fixing dependency propagation