Added if statement do wwn normalize