This is the fix that is similar to the error in GetAll()/setStructKey(), I'm not sure if this was the best way to fix it.