improve bug516