Closes #615