remove dirty hack with date localization