Added work-around for joda-time 2.2