Fix changes 2 june