Fork : Fix resolve.