closes #479