Closes #656