attempt fix #1458
Merge branch '1458'

* 1458:
  attempt fix #1458