Better fix that would work for more cases if this happen again.

Also fix the test.
pep8