Another fix for #3