Hello Maxim!

Thank you for the patch review!

Here's the fixed version of the patches.