Temorary fix for #2911.