This is dealt with in #227