fix date support