Fixed NEXFX_CORE implementation