fixed #58