Fix for CVLFAB-764.