Missing bugfix in 5.4