Fixed underline removal