definitive fix for #7