Another fix for #47