Timestamp(0) fix