See #612 and #621
See #612 and #621