improve bug529