fixed stuff after merge but still throws an undefinend reference in Control::Control which i cant resolv it occured since zibzns commit