Hotfix/fix nuts

Moving pull request over.