Fix nil value, change items