Added handling for tabs.