Issue 730

Fixes #730 once merged.