v1.1.0.334 - finish fix #742