VID-1945 fixing bug with link classes