fixed #651