Fixed Bug With null date property