Fixing timestamp issue