another fix in revert, needs to be done better (to much changes in few commits :()