Fixed problem on Date conversion from non-long numbers