As discussed in #654
As discussed in #654