Improved in 82cbbac