[WIP] More nvm workarounding