Date formating seems to have changes. This should be more stable