Corrected change with help from jonnyboy