Fixed PSI handling in FixTimestamp