Fix issue #879