Fix the change of commons-core