[WIP] Try to fix date