Temp fix for #1080