Attempt at fixing date helper