- Quick fix for #336