closes #467