repeated items fix
Merge branch 'alex' into develop