v.21 fix again