Fixes Ndex-127