First-pass fix