Bugfix for timestamp