Closes #490.