widget switching possible bug fixed