fixed #30