1.0.25.23: more allocation checks