closes #409