fixed null item issue