Test fix #8