Fix issue #651

Fix #651