Another fix for #1674