Fixing bug 2 in core files (developer ABC)