Bug fix of #bd87052