Fix nil value removal