fixed #26