Thank you for suggestions!

Here is the updated patch.