Fork : Fix wrong resolve.