修正頑固bug兩處
Merge pull request #1 from ipatrickmac/master

修正頑固bug兩處