fixed #28 issue