Fixed bug for explicit null values and tested it