Quick fix for #22