Fixing for timezone id weirdness