A timestamp fix by Arm1stice