Resolves dcsobral's objections.