Finaly fixed