Fix for shit-tab issue - issue #2