Try to fix custom dates