Fixing issue with core