updated so that the previously stored, resolved matrix will be returned, if this is set