Test fix for #306