Fixed issues with missing dates