Fix for empty date output