ugly fix for #75