Apply fix for upstream issue303a