More fix for #1141