improved nowrap functionality