Small change based on Joe's suggestion