fix in core implementation