fix 009 and 020 patches