Closes #479.