Better fix for #81