Fix bugs
fixed bugs