timestamp bugfix