fix date manipulate