Fixed the lack of recursion on some rules