Fixed date time padding issue