constant resolving fix