candidate fix for #1