Real fix for #9