Fixed timezone specific bug