Fixes #650