Added in magical fix for the option expanding