Fixes #660