Yet another temp fix for #1080