Fixed timezone conversion bug
PR: 321994