2.54

Performance fix