None value fix