Fixing issues when we changed Normal to be 1 instead of 0