Fixed StoRI resolving