fixed Date issues