Last comments of #170