Fix bug noel
fix
Merge branch 'chris'