Another fix for #111