Fix issue with null