closes #329, #299