Could we add bug number when we are going to handle this? Thanks!