Test fix #6