Fix failure reported by unit test