Fixed running to optimize