closes #1418