Tweaking the null date fix (cause by null dates)