Fix issue 99.