Table widget issue fix