Fix toolbox bug