Replace NDM with proper FIXME