Fix attempt for #22