Trying to avoid a bug in timestamp creation