nvm calls fixed