really closes #39