Fix bugs
Merge branch 'hotfix/fix_date_helper_bugs'