[TOOLS] changes, caused by previous patch