Testfix #14