Fix nuppy-puppi