closes #466