Fix multiple controllers getting pushed