Fix for the changes in core.