timob-13864: fix imports