Fix bug #283
Improve tab #282
Fix bug #281