Fixes #623; Improves #613