Sync with change in core