* Fixes NB#99264, replaced the move to logical id