closes #686