Another fix for #2