bugfix Timestamp