fix unsafe