You are probably right. But I'd like to keep thich change for SuSE/OS replacement and leave code optimalization to some next commits