fix for #22.