closes #423, closes #424