Another manual fix