fixed #2 bug