Fix memory corruption introduced by rpm5.patch