issues 19 and 20 corrections