Fixed multiple leaf problem