Fixes NDEX-238