Fix/issues 631 632

[koutoftimer]

I just did straightforward fix. No overthinking.

• I have provided code that clearly demonstrates the bug and that only works correctly when applying this fix
• I have added suitable tests demonstrating a fixed bug or new/changed feature to the test suite in tests/
• I have properly documented new or changed features in the documentation or in the docstrings
• I have properly explained unusual or unexpected code in the comments around it

Closes #631 #632
Related to #634

[koutoftimer]

How the hell code format checks are fine for master branch and didn't work for my pull request if I haven't even touched that files?

[koutoftimer]

Oh, I see, so code format issues aren't the only one. My bad.

[keikoro]

Heads-up: the most recent commit on master fixes the (recently) failing black check.

Also, some of the Windows checks + the Linux 3.6 check have been broken for a while now, so those have nothing to do with your changes.