Null dates fix