Make slightly less ugly