This is implemented in 5.4