Fix issue 476.