before andre fix