Real fix for #4.