add check for resolved