Fix commit 20.24