Fixing tableswitch.