Just a work-around for YV network...this change should be removed later...