closes #407