fixed bugs
ss