fix the complete handler