US#1215: fixed initialization logic