Bug fix found by service test