Closes #1184