Fixing build recursion