exhaustive test, another bugfix