Fixing bug in core files (developer ABC)