closes #9, reopens #30