merge with nico
fix