Another fix for #1