Further bugfixes regarding recursion