fixes #651