Fix issue #916