fix wrong narrowing
rearrangements