fix tabs with two spaces, and make it work with 0.6.5