Merge pull request #4056 from nutty898/master_nutty_fixwrongcode

Fixed wrong codes