Fixes #710, waiting on #840