Small change to save some computation