weird >=5.4 bug investigation code