Better fix for #22