Update as per Leo's comment