candidate fix for #2