Fix for system/core entry