Fix issue #758