Fixing issue with nowrap