Fixes date issue