Real fix for #25