Bug/workaround recursionlimit