fixing const folding