Adding small modification on core files