Fixes #663