improve guards deps resolving.