As discussed in #403
As discussed in #403