fixing dependency order