fixed bugs
fixed #41