Get rid of silly 'while' construct