Done Fix - 144 ,Fix -139, fix-141