add good fix
Merge branch 'fix2'