half-fix for #32