Improved in #71