fixing wrong dependency order