bugfix in core