Fixes Ndex-107