BS-9587, try to fix random database filler 6.3.2