Fix cabaret again