Fixed original JPittman branch -JEuvin