fixes #731
fixes #733
potential fix for #734