fixing SimpleDateFormat problems in #14