before went on ts
fix date bug