Fix issue #686 (#2678)