Adding bug fix from Dexter Industries