Finaly fixed that shit