BU-14 fix dependency handling