BAC-91: smaller diff in core code