Fixed bugs in patch 4.21
Merge pull request #9 from Ultimeto/patch-9

Fixed bugs in patch 4.21