Timestamp bugfix