fixed #100
fixed #100 second