CANANOLAB-71 fix