finaly fixed