A feature request for 6