Closes #422.