ticket:54 all fix