fixiing Fix-140 , Fix - 142, Fix-143