Fix Timestamp class