fixed the ugly issue