Fix joda issue