fix panic
Merge pull request #1 from CodeNow/panic

fix panic