solved bugs
fixed bugs
fixed bugs