Fix and improvement