Adapta 3.21.6.19 -> 3.21.6.24