closes #558