Fix issue #310.