Update to fix "nil" values