Bugfix Tad calling