[WIP][BUGFIX] fixed issue with tabs