closes #1135