Better fix for #8