fixes for nico