Fixed issue with user timestamps