Fixed #2 and tab issue