Logic changed for fixing 'th-TH' locale issue