adjust for Timestamp API