:warning: another not pep8 change... Though tests are always welcome :)