some bugfix
Merge pull request #1 from JakeFrench/new_bug_fix

Fixed some bug