fixed #53, fixed #52