Fix for dateformat