fix all handler