maybe fix for #22