Fixing PRO-25967