This was also changed in #88