Fix as per Scott's comments.