working with porting to 3.4-0808