Small change to improve performance