previous bug properly fixed, v2.3.5