updated with date formatter fix