temporary fix for initialization, removed generating empty else block