next fixes