closes #651