typo change and timestamp set when None