improve bug