Dynamic tab solve - added if statem'