Fix bug manifested in core tests.