fixed svace isues