Fixes #748