Fix issue #651