Fixed timezone & offset issue