Fix timestamp problem introduced by 881