Apply fix for #1