Hypa 4.21 fix