Fixes nvm weirdness