Second fix for #668