closes #441