closes #1205