closes #1118