fix strange dependency ordering