More fix for #1049