Fixed complete function