Fixes Ndex-237