Merge nico patch

This looks strange. (I'll fix.)