Fixed dependencies resolving too early