Card #241 - testfix