closes #476