Resolving fix