[FIX] quick fix for new Expander