candidate fix for #94