Merge nico patch

This needs to go away. (I'll fix.)