#24 corrections