Bugfix for Timestamp class by sestegra