finaly fix handling