Bug: 55878 fixed