closes #1184