fixing issue #25 with tabs