Fixes Ndex-153,Ndex-148, Ndex-129.