Real fix for #14, hopefully