fixed #2 issue