fix handling