Fix for UTC timestamps