Fix for infinite timestamps