Closes #1155