Fixed complete handler