before clean up
fixed #52