Fix install order issue