closes #388