Fixing bug with timestamp generation with a timezone specified