last day date fix
Merge branch 'hotFix'