Added thread 2156 & Fixed coding issue