Fix issue #773