Modified to submit tmcw's comment