Resolve issue4023