fix: correct flip for >32 bits
restructuring...