closes #618