Add Open code fix bugs

[vasily-kirichenko]

It does not appear on two following lines:

@KevinRansom I noticed a bug on your screenshot here #2161 (comment), but I cannot reproduce it on current master:

[vasily-kirichenko]

Fixed in #2166