Add workaround from recursion bag