fixed #22