Need to reproduced this in v1.60