removed if'ing, unsafe variants