fix to prevent recursive resolving