fixed issues after generation