Real fix for #119