Fix and adjustment