Fix a bug with a null value