fixed also last issue... time for combat testing...