Merge pull request #336 from legendtang/fix