porting ZD-2231 fix