Fixing hpx core