Extended indirect bugfix