closes #469