Try to improve 2.1
Fix bug