Merge nico patch

This should probably stay here. (I'll fix.)