Closes #1391